From: Joakim Verona <joakim@verona.se>
Date: Mon, 26 Aug 2013 18:22:04 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=95bca19164fe48c16e5ba04fcf6e6ddd9a22e819;p=emacs.git

merge from trunk
---

95bca19164fe48c16e5ba04fcf6e6ddd9a22e819